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)
commit338c59e72675a01dc16bbba0091b2fc0b924b2e3
treed34c0f779faa822f6e844559e45c8d5288a877f0
parentc7433912e3558c688da50940857d782fcea808e7
parent06076fc7d718f08e5096118f2f13bd517134169f
Merge pull request #2 from valhallasw/master

Several commits, including fix for issue 1 (fixes #1, fixes #2)