Changes Fixed #7 Fixed #8