Patch 2

See issue 24 for details