#001 Fixed the cross platform drawback
Merge branch 'crossplatform'