Merge pull request #2 from valhallasw/master