thanks to @abe33, #40
Merge pull request #41 from fundon/dev

thanks to @abe33, #40