Changeset 10

Merged codebase and fixed Node.Js execution issues