Merge pull request #41 from cnd11/master

bug fix
all