Combined PR (#209)