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