Merge pull request #20 from gandelman-a/pull1

pull one

Reviewed-by: Jamie Lennox
             https://github.com/jamielennox