Fix up merge problems
Merge pull request #147 from chrispbradley/master

Fix up merge problems