In Progress

bugs fixing #302