Pakse, Oudomxay and various
Merge pull request #57 from mark-lester/master

auto merge comment