Dev: edited Main class
Merge branch 'development'