Merge pull request #10 from muellners/spring_boot_2

Spring boot 2