Merge pull request #108 from F21/devel

Removed clashing files.
Fixed precondition failed in #95
Merge pull request #109 from F21/precondition_issue

Fixed precondition failed in #95