fixed versioning for dev
Merge branch 'master' into 0.0.x-dev
changed version world for branch