Changes made by Yordan Darakchiev (iordan93@gmail.com).