fix for activity empty issue
Merge branch 'versioning' into 0.1