- Fixing issue #3
- Added ability to pass parameters