Fixed API crash issues
Merge pull request #57 from lal-ace/development

Fixed API crash issues