java se 7 programmer practice commit
Merge origin/master