Fixing stupid things
Merging Stupid Stuff
Merge branch 'source'

* source:
  Fixing stupid things