Merge pull request #28 from Johnmalc/master

Swing
<=
Merge pull request #37 from AnastasiaStudent/master

<=