Implemented improvements and forked original.
Updated version
Merge pull request #2 from RWOverdijk/feature/fork

Implemented improvements and forked original.