Fixing some minor changes.
Fixing issue #8.