fixes #73
snapshot
Merge branch 'fixes' into devel