Dev

Issues #8 and #10