Patch 1.0

More will be added soon