Merge pull request #17 from MichielP1807/master