bugfix
Merge pull request #14 from jcao219/master

bugfix