fix activity bugs
Merge branch 'versioning' into 0.1