Fix #19
Add test
Debug dev environment