merged bug fix and feature to master