fix #45
Merge pull request #53 from 5lipper/enhance

fix #45