fixing bugs
Merge origin/master