Issue #56 from Ruslan Shvedov