Merge pull request #1 from rjruigrok/development

Development merged