adding features
Merge branch 'master' of git://github.com/arnapou/Toolbox