Attempted to fix #32
Started work on #31