Maked
fixed some errors
merged branches