Fixed includes
Added infix function/operator syntax