Merge pull request #6 from Rahber/master

Master