Refactor and reformat
Enhancements and bugfixes
hard coding replacement
Improved gradle
And one more file
Merge pull request #4 from MartijnWoudstra/master

Improvements, bugfixes, optimize imports, reformat. By MartijnWoudstra