Fixed bug on android

Initialisation was blocking at 90%

Jira issue: WP-933
Merge pull request #71 from smonteleone/WP-933

Fixed bug on android