some improvements
Merge origin/master