Removed daemon thread
Added TODO
Updated Gradle wrapper properties
Fixed source compatibility
cleanup
Merge pull request #2 from taktik/master

merge