Update 20140617

Added changes for minor issues.