Fixes and closes #1 - Version 1.01