committing
Merge pull request #4 from Raynos/master

And again. faster this time?