more bug fixes
Merge origin/master