Version 0.2.9

Getting changes from main repo