edited by miko
Merge pull request #1 from docteurzoidberg/master

My ubber modification to your project !