Merge pull request #80 from joshmoore/master