Fixes #35

Holy additions/deletions batman