Merge pull request #14 from xamroc/tools-test

Tools changes