Merge pull request #34 from natezb/master