Bug fix
Merge pull request #1 from alexchipliev/master

Bug fix