String additions — 20141127
Keyword additions and optimizations — 20141127