Added index to prevent source duplication.
Merge remote-tracking branch 'upstream/master'
Merge pull request #15 from teugis/master

Added index to prevent source duplication.
Merge remote-tracking branch 'upstream/master'
beginning of implementing tests