Dev

closes #201