Merge pull request #1 from Willowslab/master

devel - master merge
Merge pull request #2 from Willowslab/devel

Merge pull request #1 from Willowslab/master