some bugs
Merge pull request #19 from Priceton/patch-2

some bugs