Merge pull request #111 from F21/master

Removed clashing files.