mereged master and my copy
Merge pull request #10 from mkotov/eqs

mereged master and my copy