diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbdb5b1..8dfc5a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,19 @@
All notable changes to this project will be documented in this file.
+## [1.0.2] - 2020-09-13
+
+### Changed
+
+- `NimBLEAdvertising::start` Now takes 2 optional parameters, the first is the duration to advertise for (in seconds), the second is a
+callback that is invoked when advertsing ends and takes a pointer to a `NimBLEAdvertising` object (similar to the `NimBLEScan::start` API).
+
+- (Arduino) Maximum BLE connections can now be altered by only changing the value of `CONFIG_BT_NIMBLE_MAX_CONNECTIONS` in `nimconfig.h`.
+Any changes to the controller max connection settings in `sdkconfig.h` will now have no effect when using this library.
+
+- (Arduino) Revert the previous change to fix the advertising start delay. Instead a replacement fix that routes all BLE controller commands from
+a task running on core 0 (same as the controller) has been implemented. This improves response times and reliability for all BLE functions.
+
## [1.0.1] - 2020-09-02
### Added
diff --git a/docs/Doxyfile b/docs/Doxyfile
index 31cbece..c328bb5 100644
--- a/docs/Doxyfile
+++ b/docs/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME = "esp-nimble-cpp / NimBLE-Arduino"
# could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = 1.0.0
+PROJECT_NUMBER = 1.0.2
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
diff --git a/docs/Improvements_and_updates.md b/docs/Improvements_and_updates.md
index 642b174..245defd 100644
--- a/docs/Improvements_and_updates.md
+++ b/docs/Improvements_and_updates.md
@@ -4,6 +4,7 @@ Many improvements have been made to this library vs the original, this is a brie
Refer to the [class documentation](https://h2zero.github.io/esp-nimble-cpp/annotated.html) for futher information on class specifics.
* [Server](#server)
+* [Advertising](#advertising)
* [Client](#client)
* [General](#general)
@@ -60,6 +61,16 @@ it's characteristics / descriptors will remain valid and the service can be re-a
using `NimBLEServer::addService`.
+
+# Advertising
+`NimBLEAdvertising::start`
+
+Now takes 2 optional parameters, the first is the duration to advertise for (in seconds), the second is a callback
+that is invoked when advertsing ends and takes a pointer to a `NimBLEAdvertising` object (similar to the `NimBLEScan::start` API).
+
+This provides an opportunity to update the advertisment data if desired.
+
+
# Client
diff --git a/docs/Migration_guide.md b/docs/Migration_guide.md
index b88de5f..6967182 100644
--- a/docs/Migration_guide.md
+++ b/docs/Migration_guide.md
@@ -224,6 +224,14 @@ Calling `NimBLEAdvertising::setScanResponseData` without also calling `NimBLEAdv
When using custom scan response data you must also use custom advertisement data.
+> BLEAdvertising::start (NimBLEAdvertising::start)
+
+Now takes 2 optional parameters, the first is the duration to advertise for (in seconds), the second is a callback
+that is invoked when advertsing ends and takes a pointer to a `NimBLEAdvertising` object (similar to the `NimBLEScan::start` API).
+
+This provides an opportunity to update the advertisment data if desired.
+
+
## Client API