Merge pull request #10 from jankner/1.x

Fix for codeMotion2.
Version bump