fixes #1 & #14