Minor changes.
Merge pull request #3 from RBertram/dev

Minor changes.