Some corrections
Merge pull request #312 from beriain/development

Some corrections