Solved the minor issues
Merge pull request #60 from lal-ace/development

Solved the minor issues