Several bugs fixed man!
Merge origin/master