Bug fixes
Versioning