Moving features up
Adding analytics
Merge branch 'release/v0.1.8'