changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	cib
fix
Merge pull request #8 from rajthilakmca/master

fix