closes #1
closes #3
closes #6
Revert "closes #6"

This reverts commit 79446c18f6cc2817205bf1c6ae5aaa0eeba65045.
closes #6
Merge branch 'master' into develop