Fixed #9: source format and function rename