added some usefull stuff
Merge origin/master