bugs
stand
Merge pull request #39 from dreanor/untested

Untested