More buzzwords
Merge pull request #22 from korczis/master

Merge Master to Stable