Global update.
Small fixes
Merge pull request #6 from chrishumboldt/dev-chris

Small changes.