Fixes #2.
Merge branch 'master' of https://github.com/trendicity/trendicity