Issues ready to merge

Ready on dev: #5, #11, #18 & #22 waiting for merge.
I would be great if you can add a new label "ready"