Merge pull request #25 from neggro/master

Please read the comment to know what is happening here...