Fixed #12
Comments
Fixed duplicate function names