fixed #40 and #41
Merge branch 'altworking' into develop