Some small fixes.
Merge pull request #3 from chrishumboldt/dev-chris

Some small fixes.