Merge #127

This merges #127. This should only be merged once Travis build passes.