refactoring, remove optional parameters
Merge pull request #36 from lukaselmer/rafactoring-remove-optional-parameters

refactoring, remove optional parameters