Adding Logic Class
Merge branch 'dev'