Merge pull request #22 from RobertWalsh/master

Updates. See commit details.