Merge pull request #3 from DerDu/master

Development ... (doh)