Updated master with latest develop

Re-added missed changes from previous dates.
Added callback and adjusted chaining methods.