Some fixes and improvements
Merge pull request #70 from NativeScript/fatme/fixes-and-improvements

Fixes and improvements