Merge pull request #70 from saterus/master