Resolving github issues #22, #17, and #6.