Fixed #11 and fixed #12