Merge Request #13 Conflicts resolved
Merge pull request #15 from elpesci/develop

Merge Request #13 Conflicts resolved