Merge pull request #11 from Rahber/master

Master