90% test coverage
Merge branch 'master' into github