Converted to a Maven project for better dependency handeling.
Merge remote-tracking branch 'origin/master'