changes for issue #55 and issue #10
basic versioning support issue #10
code cleaning