Merge branch 'origin/dev'

-Improved portability of code between array sizes
-Changed some functions to void type