small changes
fixes confilcts
Merge pull request #25 from allanmonzon/master

index changes