Continuing #309

Continuing @zzamboni work from #309 

Fixing bug reports from @nickanderson and @bheilman