Merge pull request #1 from Fabrik/master

request 2