Merge pull request #2 from Jam-Craft/master

Added mainclass to gradle configuration
Cleanup and better agurment handling
Merge remote-tracking branch 'upstream/master'