Copied changes from master.
Renamed to match Github's conventions.