Addressing issues #11 and #13.

Let me know how this works -- I'll have more changes soon.