Merge pull request #29 from jsilvestre/master

Minor fixes
Fixed #30