Tu1ly/fixes

https://github.com/apiaryio/gavel.js/issues/18
https://github.com/apiaryio/gavel.js/issues/24