Fixes and improvements
Merge pull request #76 from NativeScript/fatme/fixes

Fixes and improvements