Dev to Master Pull 

Addresses #102 #101