fixed and ready

ready for pull request(backup without this version in faq)