Fixes #4.
Merge remote-tracking branch 'origin/master' into spiritual-mall