Merge pull request #76 from ndw/tools-upgrade

Tools upgrade