Merge pull request #5 from jeroenseegers/development

Development