Merge pull request #16 from chadadavis/master