Very minor stuff (me being picky)
Really fix #29