updates #21
updates #167
closes #298
Merge pull request #337 from fgiannar/develop

updates