Merge pull request #1 from evphan/newb

v1