refactored parameters for easier usage, fixes #28