merged wierd branch changes from version 0.10.4 nad 0.10.5; all specs passing