Merge pull request #47 from ARGOeu/devel

Merge devel to master