Ported over to the latest incoming. Removed deprecated extern module names.
Merge pull request #36 from sstewartgallus/master

Port over to the latest incoming