Merge branch 'release/v0.6.0'
Fixed timeline.haml.html syntax error
Merge pull request #48 from saeedSarpas/hotfix/v0.6.1

Hotfix/v0.6.1