Closing issues #11, #14, #9, and #5.