Merge pull request #28 from alerque/devel

Devel branch maintenance