Merge pull request #1 from mstahv/master

Update to latest master