Achissue32

Fixing #32