version changed to distinguish from 0.0.1 branch
getting rid of redundant code