Merge pull request #1 from avz-cmf/devel

1