Fixes #66 & # 64