dev to master

Issue #232