wip
wip
Merge pull request #21 from olevole/10.0.6

10.0.6