Changes made by Denis Stoyanov (denis.a.stoyanov@gmail.com).