Merge branch 'hotfix/v0.2.1'
Fix for analytics
Merge branch 'hotfix/fix_analytics_sept_11_13' into develop