Closes #36 and fixes broken tests (flagellation occurred).