Static

Merging Static and Master