Changed settings again
Merge branch 'tanujb' of https://github.com/gpranav88/fbpic into tanujb