CFP changes
Index fixed
Merge pull request #7 from truepl/master

CFP changes