diff --git a/README.md b/README.md
index 489a04044..e63e41ae2 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,7 @@ This repo is based on iceman fork for Proxmark3. It is dedicated to bringing the
|[Issues](#issues)|[Blue shark manual](/doc/bt_manual_v10.md) ||
|[Notes on UART](/doc/uart_notes.md)|||
|[Notes on Frame format](/doc/new_frame_format.md)|||
+|[Notes on Termux / Android](/doc/termux_notes.md)|||
|[Developing standalone mode](/armsrc/Standalone/readme.md)|[Wiki about standalone mode](https://github.com/RfidResearchGroup/proxmark3/wiki/Standalone-mode) ||
|[Donations](#Donations)|||
diff --git a/client/default_keys.dic b/client/default_keys.dic
index 5add442e7..922d35914 100644
--- a/client/default_keys.dic
+++ b/client/default_keys.dic
@@ -902,5 +902,21 @@ b1a862985913,
3b0172066b2f,
3f1a87298691,
f3f0172066b2,
-
-
+#
+# Tehran ezpay
+#
+38A88AEC1C43
+CBD2568BC7C6
+7BCB4774EC8F
+22ECE9316461
+AE4B497A2527
+EEC0626B01A1
+2C71E22A32FE
+91142568B22F
+7D56759A974A
+D3B1C7EA5C53
+41C82D231497
+0B8B21C692C2
+604Ac8D87C7E
+8E7B29460F12
+BB3D7B11D224
diff --git a/doc/bt_manual_v10.md b/doc/bt_manual_v10.md
index 88f2acdaf..d8d86b4fd 100644
--- a/doc/bt_manual_v10.md
+++ b/doc/bt_manual_v10.md
@@ -33,9 +33,12 @@ Built-in battery can support standalone mode, off-line sniffing, off-line readin
* Unplug your Proxmark3 RDV4.0 device from any usb cable.
* Remove the plastic upper case of Proxmark3 RDV4.0 with opener.
-* Remove temporarily the antenna with a screwdriver to expose the FPC interface.
-* Turn off all power switches, insert the FPC wire into the FPC connector, and lock the FPC connector.
-* Tear off the blue film of heat conductive double-sided tape. Align the add-on to the hole positions and gently insert it into the case.
+* Remove temporarily the antenna with a screwdriver to expose the FPC interface.
+ 
+* Turn off all power switches, insert the FPC wire into the FPC connector, and lock the FPC connector.
+ 
+* Tear off the blue film of heat conductive double-sided tape. Align the add-on to the hole positions and gently insert it into the case.
+ 
* Assembly finished!
@@ -92,7 +95,8 @@ You can also switch serial port from inside the proxmark3 client using the new c
* Install driver:
http://www.silabs.com/products/development-tools/software/usb-to-uart-bridge-vcp-drivers
* Insert the adapter into the USB port. The adapter will search automatically and establish the connection. The adapter will remember the device that was first connected and after that the same device will be connected.
-* The adapter button can be used to delete memory so that other add-on can be searched and connected.
+* The adapter button can be used to delete memory so that other add-on can be searched and connected.
+ 
* After the connection is established, the blue state LED on add-on will turn on solid.
* look for _CP2104 USB tp UART bridge controller_ under devices in order to get the assigned serial port
@@ -141,7 +145,9 @@ the device that was first connected and after that the same device will
be connected.
2. The adapter button can be used to delete memory so that other add-on
-can be searched and connected.
+can be searched and connected.
+
+
3. After the connection is established, the blue state LED on add-on will
turn on solid.
diff --git a/doc/termux_notes.md b/doc/termux_notes.md
new file mode 100644
index 000000000..f568c6f16
--- /dev/null
+++ b/doc/termux_notes.md
@@ -0,0 +1,68 @@
+# Proxmark 3 on Android
+
+## Requirements
+- Android phone
+- Kernel with one of:
+ - USB_ACM driver
+ - module loading enabled
+ - published sources
+- Root
+- [Termux](https://play.google.com/store/apps/details?id=com.termux)
+
+## Notes
+From official Proxmark3 wiki:
+ > In any case, you would need a USB-C to A or USB-OTG cable to connect Proxmark3 to your Android device. Some Android devices may not supply enough power (USB-OTG = 100mA), and need a USB Y-cable and external battery, otherwise they will get strange failures.
+ref : https://github.com/Proxmark/proxmark3/wiki/android
+
+## Tested setup
+- OnePlus 5 (arm64, USB-C)
+- [OmniROM (Android 9)](https://www.omnirom.org/)
+- [OmniROM kernel](https://www.omnirom.org/)
+- [Magisk 19.3](https://github.com/topjohnwu/Magisk/)
+
+## Setup
+### Getting ncurses with termcap
+You need `termcap` to build the Proxmark3 client. Unfortunately, the prebuilt `ncurses` package does not include it. Since [this PR](https://github.com/termux/termux-packages/pull/2131) hasn't been merged yet, you will have to build `ncurses` yourself
+
+1. Clone the [termux-packages](https://github.com/termux/termux-packages) repo
+2. Apply [the PR](https://github.com/termux/termux-packages/pull/2131)
+3. Build `ncurses`. Refer to the [build docs](https://github.com/termux/termux-packages/blob/master/docs/BUILD_ENVIRONMENT.md) for more information. The easiest way is to use Docker:
+ - `./scripts/run-docker.sh`
+ - `./build-package.sh ncurses`
+ - the built packages will be under the `debs` directory
+4. Copy `ncurses_6.1.x-x_aarch64.deb` to your phone's `/sdcard`
+### Setting up Termux
+1. Install [Termux](https://play.google.com/store/apps/details?id=com.termux) and start it
+2. Run the following commands:
+```
+pkg install make, clang, clang++, readline-dev, libclang-dev, libc++, git, tsu
+termux-setup-storage
+dpkg -i /sdcard/ncurses_6.1.x-x_aarch64.deb
+git clone https://github.com/RfidResearchGroup/proxmark3.git
+```
+### Building Proxmark3 client
+1. Edit `proxmark3/client/Makefile` and append `-fPIC` to the `CFLAGS` variable (line 30)
+2. `make clean && make client`
+
+### USB_ACM
+You need the `USB_ACM` driver enabled and working to communicate with the Proxmark3. To see if it's working, run `tsudo ls /dev/tty*` and it should list `/dev/ttyACM0` (or similar). If you see this, congratulations, skip this step!
+
+#### Enable the driver
+If your kernel has module loading enabled, you should be able to build the module separately and load it on your system without any changes. Otherwise, grab your kernel sources and edit your build config to include `CONFIG_USB_ACM=y`. On the tested kernel, this was under: `android_kernel_oneplus_msm8998/arch/arm64/configs/omni_oneplus5_defconfig`
+
+#### Building the kernel
+If using a custom kernel, refer to the build instructions provided by its maintainer. Otherwise, follow the standard Linux kernel build procedure
+
+#### Flashing the kernel
+You can flash the kernel however it suits you. On the tested device, this was achieved using [TWRP](https://twrp.me/), the most popular custom recovery
+
+### Testing
+Open Termux and start the Proxmark3 client:
+```
+tsudo proxmark3/client/proxmark3 /dev/ttyACM0
+```
+Everything should work just like if it was your PC!
+
+### Troubleshooting
+- `dmesg | grep usb` - useful debug info
+- `/proc/config.gz` - contains your kernel's build configuration. Look for `CONFIG_USB_ACM`, which should be enabled