Jeremiah/146

Resolves Issue #146