fixed to build on CentOS 6.3.
updated TODO.
reverted the wrongly deleted synchronization in commit: 60037207.