Merge pull request #57 from adickison/master