Merge pull request #29 from Kierz/master

Merge #12