Merged Fixed #6