fixups
update refs
Merge pull request #47 from davidsiaw/master

fixups