n3554/n3554 — pull request #14 by arturl (2013-08-16 21:06:11+00:00)
Title: Addressing issues #11 and #13.

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