Initial import of new version
Merge branch 'master' of github.com:cnicodeme/Catapult