Changes made by Dejan Špegar (dspegar@execom.eu).
Merge branch 'master' of https://github.com/1000words/1000words.git