Fix #11.
Merge branch 'master' of github.com:fruux/sabre.io