1.0master

updating master with 1.0.0 changes and tagging current master as .95