Merge pull request #79 from ns-uw/master

Two commits