Minor changes.

An attemp to fix issue #1