Merge pull request #12 from muellners/spring_boot_2