Finished changes and closed #106