Make fields optional.
Make field optional.
Use brackets.
Merge pull request #8 from svenmueller/master

Refactoring.