Replace local temps with calculations
Merge pull request #5 from pkordel/05_replace_temp_with_query

Replace local temps with calculations