Merged my fixes with #261