Updated ONLP to head
Merge pull request #31 from capveg/master

Updated ONLP to head