fixed error introduced by previous commits
Merge branch 'master' of https://github.com/mfrey/baltimore