Closes Issue #12
Closes Issue #13