Merge pull request #55 from Donderstraal/master