Merge pull request #1 from PetteriAimonen/master