initial commit v1.0.2 with a few of my changes