Fixes #303
Merge branch 'master' of https://github.com/bakerframework/baker