Issues: #45, #44

  * Duplication bug is solved by adding path numbering