Merge pull request #29 from Namasteh/master

Get devel up to date
Merge pull request #30 from Namasteh/master

v6.3
Merge pull request #31 from Namasteh/devel

Devel