Consistency changes for pull request #3
Merge pull request #4 from Oefenweb/consistency-changes

Consistency changes for pull request #3