time reduces from ~30 min to ~10 min
time reduces from ~27 min to ~6 min
time reduces from ~71 min to ~22 min
needs testing
Merge pull request #325 from pisaychuk/master

Time reduced