Partial #33 and partial #11
Merge remote-tracking branch 'origin/maven' into maven