Major preformance improvements
Merge pull request #31 from humanity/preformance-improvements

Major preformance improvements