Starting Swing
Merge origin/master