Merge pull request #30 from meverone/master

fix bug