add versioning, few small changes
Merge pull request #24 from awlange/develop

add versioning, few small changes