Merge pull request #2 from compudj/master

Signed-off-by: Christian Babeux <christian.babeux@efficios.com>
Merge pull request #3 from compudj/master

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Add minimal test-case (pass)

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>