Improved portability
auto-merge staging into master