read me changed
Merged master fixed conflict.