Merge pull request #2 from valhallasw/master
authorpkienzle <pkienzle@gmail.com>
Fri, 14 Oct 2011 23:41:49 +0000 (16:41 -0700)
committerpkienzle <pkienzle@gmail.com>
Fri, 14 Oct 2011 23:41:49 +0000 (16:41 -0700)
Several commits, including fix for issue 1 (fixes #1, fixes #2)


Trivial merge