Closes #23. Immutable array error on ios8