Fixes issue #318
Housekeeping
Merge pull request #352 from fgiannar/develop

updates