Resolves Issue #10 #12