trigger travis?
Merge pull request #11 from adriaanm/test

trigger travis?