Merge pull request #6 from XDocker/master

arao branch update
message in ticket -quick fix
Merge pull request #24 from araoxervmon/master

message in ticket -quick fix