wkerzendorf/v445puppis-2013B-Phase1 — pull request #1 by wkerzendorf (2013-03-26 16:21:44+00:00)
Title: Martins changes

Of martins and my changes