Merge pull request #45 from philelauria/master

index.js conflict resolved