Work on heaters; p-stop
Merge pull request #38 from jetty840/dcnewman-merge

Work on heaters; p-stop