snapshot
fix for [#71]
some more improvements for #71
some more improvements for #71 2
Merge branch 'feature/71', remote-tracking branch 'origin'