Merge pull request #1 from webwayer/master

PUUUUUUL