#17 -- v 0.9.6
Merge pull request #18 from MobileAppTracking/17_v_0_9_6_a

#17 -- v 0.9.6