Fixed issue with parse error
Merge branch 'master' into nilov