Update for version 0.2.6
Version 0.2.6
Merge bug fix