final ship it hopefully
Merge pull request #4 from clauniel/master

final ship it hopefully