Merge pull request #68 from nhr/master

Several improvements based on review feedback