Sylvhem Merge pull request #2 from wryk/master …