added improvements
Merge pull request #1 from Arkanain/base_functionality

added improvements