Dev

Just updated the enhancements for #230