Tests!
Merge branch 'tests'
Merge pull request #4 from ws/master

Tests!