TrinityWestern/Lasy — pull request #2 by sigbus (2012-10-24 22:54:09+00:00)
Title: Merge Brian's changes

I think this is how to merge Brian's changes.