bug fixes
minor bug fixes
Merge origin/master