Cleaned up merge and put in possible fix for reading parcel in SavedState(Parcel in)
Merge pull request #37 from aarya123/patch-1

Cleaned merge and possible fix for SavedState(Parcel in)