Working project before merge with Adam
Result of merge with Adam classpath fixed
Merge remote-tracking branch 'slipson/master'