Fixed #4 and fixed #11