Please, accept that pull request

I've reviewed existing forks and merged those which looks OK to me. Please, review.