speedup via streams and cleanup
Merge pull request #139 from woeishi/develop

disperse speedup via streams and cleanup