Testing pull request
Merge remote-tracking branch 'origin/master' into Alex-Branch
Fixed arrayoutofboundexception