fixes #284, updates #12