Merge pull request #1 from pjf/drowfort

Updated drowfort based upon SWP upstreams