initialization is still left. defined basic class
Merge branches 'master' and 'dev'