0.0.6 master commit.
Merge branch 'dev'
Merge with dev.
Update
Fixed tests.
Version bump
Dev to dev branch.