PR#74 Fixed Conflicts

Fixed the conflicts from PR#74