Merge pull request theodox#79 from theodox/fix_tools

Fix tools

Merge pull request theodox#62 from theodox/test_and_stability_fixes

Test and stability fixes

Merge pull request theodox#62 from theodox/test_and_stability_fixes

Test and stability fixes

Update readme.md