I made the major modifications I could think of because they were necessary for work.#75

jasagiri wants to merge 2 commits intozevv:masterzevv/npeg:masterfrom

jasagiri:masterjasagiri/npeg:masterCopy head branch name to clipboard