Fixed #44
fixed #44 in master