closes #82 (closed)
ping @amohammadi
This will create a new commit in order to revert the existing changes.