fixed #44 and #45
version 1.2.5