[20160819234527] Bug Fixes