Fix minor bugs
test
Merge pull request #2 from pbastide/develop

Develop