Merge pull request #20 from neggro/master

Read the comments...