Resolved issue #25 and changed some names