merge complete
updated README.markdown