merged from Ver 1.0 branch
merged the last file from Ver 1.0
small fixes after the merge
small changes