added some usefull stuff
Merge origin/master
added some usefull stuff