Merge pull request #8 from clavaque/000000-dev

See commits