Fixed issue #12

This pull request is a patch for #12