Changes made by Vladimir Zagorski (vlao85@gmail.com).