Changes based on @colincsl in issue #16 to support building to PCL 1.6 in the 1.6 branch

Not sure if you want to include it, but I needed to make the changes to build to 1.6 on my machine, and the current 1.6 branch still doesn't have the changes incorporated.