Two performance improvements#19

aardvarkk wants to merge 2 commits intorubyredrick:masterrubyredrick/ri_cal:masterfrom

AppColony:masterAppColony/ri_cal:masterCopy head branch name to clipboard