Fixed #31 Bug Number 2