closes #751
Closes #752
Merge pull request #759 from spumko/feature/misc

Feature/misc