Fixed Issue #1

Mostly