Merge pull request #1 from PointCloudLibrary/master

Merge with master repo
Merge pull request #219 from rbrusu/master

Merge pull request #1 from PointCloudLibrary/master
Merge pull request #220 from PointCloudLibrary/master

Revert "Merge pull request #219"