Please merge Refactoring

Refactoring of graphite class