refactoring logic
Merge remote-tracking branch 'origin/master' into Experimental
Merge pull request #3 from demns/Experimental

Experimental