Solves Issue #9