updated to new version cleaning up some mess. 1.0.2