Fixes for STP.
Merge pull request #10 from ruricolist/stp

Fixes for STP.