Fixed #31 Bug 3