Merge pull request #44 from Hasimir/master

completely serious, mum