Fixed 99% of bugs
Fixed 99% of bugs
Merge origin/master