fixes #284, updates #12
Merge pull request #285 from fgiannar/develop

fixes #284, updates #12