Merge pull request #1 from rjruigrok/development

Development merged
Merge pull request #2 from rjruigrok/master

Merge pull request #1 from rjruigrok/development