Fixes For Issue #16
Merge pull request #17 from d2g/patch16

Fixes For Issue #16