Updates for serialization
Merge branch 'develop' of https://github.com/alertsolutions/APIClient into develop