PXE refactor
Merge pull request #622 from psav/pxe_refactor

Pxe refactor