Merge pull request #101 from christiam/master