Merge development to master for bug fix

Related to issue #14 (closed), development has been updated to use tini-amd64 and this should fix the bug