Merge pull request #9 from glinscott/master