Merge pull request #29 from echen027/master

fixed -0400 bug