Resolved #21
Merge branch 'master' of https://github.com/NaviNet/tre-la-la
Merge branch 'master' into gh-pages