Issue 100

Sorry - closing this PR due to some problems with a messy merge. Please see next PR. Note - above error was corrected.