Fixed minor issues
Merge pull request #62 from lal-ace/development

Fixed minor issues