Merge pull request #68 from ns-uw/master

3 commits from today