Merged with my config
Merged with my improved stackTable
Merged
Merged with team's files
Merge origin/master