Fixes #66 #67