Merged #86!