fixes to prepare codebase for 3.0
Merge pull request #7 from cjemagid/3.0

fixes to prepare codebase for 3.0