Merge pull request #99 from RobertWalsh/master

Bug fixes. See details for description