changed concatenation order to be consistent with demo, fixes #15