Merge pull request #19 from nateskulic/master