Merge branches 'master' and 'lynx'
Merge pull request #27 from Hasimir/master

Merge branches 'master' and 'lynx'