Solved new bugs
Merge pull request #74 from lal-ace/development

Solved new bugs