Merge pull request #1 from ivan-bright/master

kj