Latest commit cbbec3a Nov 4, 2016 @danialfarid fixed #1633, fixed #1748