New Features, Bug Fixes

New Features, Bug Fixes