merge our fixes to master project