bug fixes
Merge pull request #145 from cferdinandi/development

bug fixes