V2.6- Resolved Github Issue

Resolved #90, #93, #123, #127, #135, #139, #144, #145, #146, #147, #149,
#151, #157, #161
I had removed these 3 lines.  Please make sure when we're merging we're not putting stuff back that was removed.