Fixed Issue #363

Unit tests to follow

- You can see by the multiple reverts that I had quite some fun. Need to do something with config I expect to allow file endings to differ happily between Windows and Mac environments