More speed improvement
Merge pull request #26 from Break-Neck/speed_improvement

More speed improvement