Fixed - #21

Fixed - #22

Fixed - #23

Fixed - #24

Fixed - #25

Fixed - #26

Fixed - #27

Fixed - #28

Fixed - #29

Fixed - #30

Fixed - #31

Fixed - #32

Fixed - #33

Fixed - #34

Fixed - #35

Fixed - #36

Fixed - #37

Fixed - #38

Fixed - #39

Fixed - #40