Merge pull request #23 from RobertWalsh/master

Updates. See commit details.