Will close #35 and partially resolve #49.
Will close #35 and partially resolve #49.