rework...
Merge pull request #9 from Pomax/rework

rework...