[20161122174212] Enhancements and Bug Fixes