Some major changes
Merge origin/master