packaged up! Fixes #8