Issue #279
Issue #270
Issue #271
Merge pull request #291 from FWAJL/dev

dev to master