swing
Merge pull request #31 from Johnmalc/master

swing upd