Merge branch Isue 33

Despite the typo in name, this resolves issue #33