Merge branch 'devel'
Merge pull request #1 from therufa/master

Merge branch 'devel'