Merge pull request #22 from tobigrimm/master