Changes made by Nikola Nikolov (themagicis777@gmail.com).