#29, #14, #10, #8 can be closed out.
Merge pull request #33 from ahebert/master

#29, #14, #10, #8 can be closed out.