Merge pull request #1 from summeragain/master

up to date