Fixes #131 #134