Fix #20 and added an ATF test-case.