Results 2 issues of Dmitrijs Milajevs

This is mostly a peer review request :) Please have a look to the changes. Since cython is not used it gives potential support on every Python implementation that is...