Merge pull request #33 from daylen/master