Merge branch 'issue-#148' of https://github.com/BlackBoxCenter/blackbox into issue-#148

# Conflicts:
#	Std/Mod/Coder.odc

Signed-off-by: Robert <rdcampbell.98@gmail.com>