Derp
Post Test #2 bugfixes
Merge pull request #170 from ZomgPonies/master

Post test #2 bugfixes