Switched codebase for now
Merge pull request #3 from Mikers/master-0.8

Switched codebase for now