Merge pull request #1 from mariush13/work

some changes
Merge pull request #2 from mariush13/work

fixes
new features
layout for new features
autoloader in different file
new custom object