Completed work on #67 for beta release, ready to merge into master.