updated stuffs

Assimilating branch into master. It will now be one with the Borg.