Pr35

/cc @wowscode

Cleaning up #35