Merge pull request #326 from hhovsepy/master

some refactorings, added more scenarios
implemented: issue #290
Merge remote-tracking branch 'upstream/master'
added new scenario for github 327