Sync with latest common lib
Merge pull request #138 from NativeScript/fatme/sync-with-common

Sync with latest common lib