Fixed a couple bugs
Merge remote branch 'origin'