vjoel Merge pull request #6 from leoschwarz/master …