Merge pull request #25 from troymccabe/master