Added Versioning and a few bug fixes.