Issue #406 continued
Merge pull request #410 from Sovietaced/master

Issue #406 continued