Dirty draft of using features2d for calculating

This is a PR accompanying #195.