Merge pull request #3 from dayson/next

Merge pull request #2 from dayson/master
Merge pull request #4 from dayson/master

Merge pull request #3 from dayson/next