Implementation of the comments from #45 #50

Closed
gregoo wants to merge 8 commits from gregoo:upstream-instructions into instructions

8 Commits