Fixes #151 #12