Rename and fix issue#1

Fixes issue/#1