close #785
Merge pull request #786 from fluxuator/2.0

close #785