Update 1.8

merged dev version with master to update to 1.8