Merge pull request #1 from summeragain/master

up to date
Merge pull request #16 from denzp/master

Merge pull request #1 from summeragain/master