hooray
merged changes from master, fixed conflict in jason.yay