Minor update - decoupled the project from Console