close #4
finished and will setup for the release of 2.0 milestone