Fixing issue 63.

This pull request fixes the issues in #63.