Fixed some bugs??
Merge pull request #27 from dgianotti/master

Fixed some bugs??