did some fixing
Merge origin/master