fixed Price's mistakes
fixing
prepared for merging
test
stuff
Merge branch 'Alex' into asonix
stuff
somthing