Merge branch 'Beta_1.0'

#Final edit version
I think this version works properly... if you need help with it tell me...