Merge branches 'master' and 'links'
Merge pull request #25 from Hasimir/master

Merge branches 'master' and 'links'