Merge pull request #8 from phdelodder/devel

Devel