#29 -- Cleanup
Merge pull request #32 from MobileAppTracking/29_v_0_9_8

#29 -- Cleanup