Bug fixes
Merge pull request #177 from fgiannar/develop

Bug fixes