Dev

closes #209 and closes #114