Merged pull 31 
Upgraded compiler plugin to 2.4
Upgraded Java version to 1.7