Working on #32
Working on #32
Fix #32
Merge branch 'achissue32'