Fix #43 - Companion