Merge pull request #29 from teeeg/master

closes #20 #21