Solves Issue 2 from #55