Solved issue #33 #30 #31