Add Bug Fixes to master