Merge pull request #150 from cjemagid/3.0

merged andrew's work