Fixed #1 , fixed #2 , pretty stable