remove bullshit
Merging release into master.