Merge pull request #1 from cemmersb/master

I've incorporated the latest changes.
Please checkout the latest sources.