#20 - v 0.9.4
Merge pull request #22 from MobileAppTracking/20_refactor_stage

#20 - v 0.9.4