Merge pull request #20 from muellners/spring_boot_2