Bug Fixes
Merge branch 'maste
edited to fix bugs