Merge pull request #19 from Hasufel/master