initializing system
Merge origin/master