Merged 1.0.5 to neo working

Merged 1.0.5 to neo working