Merged Disambiguation branch with master

    * Disambiguation added to master.
    * Minor Fix