Merge pull request #18 from BenjaminVanRyseghem/master

Some minor fixes