Allenardo

Fixes issue #41 and issue #42