Merge pull request #102 from mwarning/master