Merge pull request #2 from jpiemeisl/master

pulling from master to development
Merge pull request #3 from jpiemeisl/development

Merge pull request #2 from jpiemeisl/master