commit stash into liam branch
Merge pull request #17 from palmerhyde/Liam

commit stash into liam branch