Merge pull request #96 from mstap/master