Merge pull request #283 from Jakobo/master

Simple enough. Ship it!