Developer trying to code like other of them patch 22 (#99)

Developer trying to code like other of them patch 22 (#99) #536