Revert changes
Added the default values in a better place
Merge pull request #297 from ZeusWPI/fix/292/fix-default-values

Revert changes