Fixes for issue #23 

Addresses issue #23