Merge pull request #72 from tomwayson/3.0.0-Alpha

merged
Merge pull request #78 from tomwayson/3.0.0-Alpha

merged