Fixes for issues #4 and #18