Fixed the issue #6

I fixed it in my fork, please help to merge.