syncing 1.0.0 with master

just syncing stuff up