Merge pull request #42 from avinashcpandey/develop

Fixed one bug for Serial Scan by key code + changed map/unmap code + som...