bring edge up to date with 0.6 pull requests
Merge pull request #160 from evs-chris/master

Bring edge up to date with 0.6 pull requests