Issue 2

Fixing issue #2.