Try to fix Core.Std
Merge pull request #26 from lpw25/master

Try to fix Core.Std