Merge pull request #2 from elij/master

Changed to use spring boot