Fixed #10, fixed #11 - renamed parsing method and updated short forms