V1.0 merge

This is a merge branch for inclusion of #60 and #62. They had fallen a little out of sync with the project so I had to manually merge them here.