[20161012224448] Bug Fixes and Enhancements