Noah's version
Merge pull request #1 from veltman/master

Noah's version