add support for getting rhine points
merge with master