Fixed issue #565
Merge pull request #1 from vitmalina/master

update from original