Merge pull request #101 from michaelnsj/3.0

Merged.