fixes #4
Merge branch 'ttoets-mei-sol'