Merge branch favourite in master

Should resolve:

#4 #5 #17 #23 #24 #25 #27 #28