Solved Issues #72 #70 #66 #39