Dev

Addresses #102 #101