Merge pull request #2 from jVelay/devel

Devel
Merge branch 'devel'