Dev

Closed #1