Merge pull request #11 from mweastwood/improvements

Various fixes and improvements