Merge pull request #1 from XDocker/master

arao branch update
Merge pull request #2 from XDocker/master

arao branch update
Merge pull request #3 from XDocker/master

arao branch update
Merge pull request #4 from XDocker/master

arao branch update
ticket tabs and comments added
Merge pull request #22 from araoxervmon/master

ticket tabs and comments added