Manually edited version of core not working.  Rolling back
undo changes
Merge branch 'master' of https://github.com/derekshc/141L