Changes made by Marlon Volganli (m.volganli@gmail.com).