Master

Updates to the API, Contributing guidelines and a fix for #66 

Closes #66