Merge pull request #8 from glinscott/master