checking errors
checking errors aswell
Merge origin/master