swistak35's pull request

I am making a pull request now, to have place for discussion and critique : )