Resolve Issue#47