merged changes from master (between 0.04 and 0.041)