Fixed issue 1

Fixes Issue #1