some modifications
Merge origin/master