sammagnum/steg4953wavgrp7 — pull request #2 by sammagnum (2012-07-30 13:59:10+00:00)
Title: merging with master

merging with master