Merge pull request #1 from Martacus/master

k