Manually merged, Closing #471
Manually merged, Closing #469
Manually merged, Closing #468
Updated Travis build configuration