Issue Fixes

fixed #1