Fixed something, implemented logical and algebrical expressions
Closed #16