fix #6
#7
Merge pull request #8 from kharazi/master

fix #6