Changes Fixed #1