Fixed issue #13

Fixing issue #13.