Dev update: Parcelable objects

.
Merge pull request #1 from Mr-Nilsen/Development

Dev update: Parcelable objects