Issue 15

Fixes for Issue 15.