#109 added handling of return types: byte[] and short[]
#111 extracted methods
Merge remote branch 'fork/109'