Reduced object allocations
Merge pull request #92 from myui/hotfixes

Reduced object allocations