fix comment
fix include paths
Merge branch 'fix20131025'