Merge pull request #147 from Lab41/master

Fixed compilation error caused by Titan commit 639d431.