mironal Merge pull request #119 from mironal/update-tools