Added standalone version