#193: skeleton
#193: works in skeleton
#193: more complex testing (fails)
#193: more tests and fixes
Merge branch 'master' into 193
#193: implemented and tested