Added older stuff
Merge pull request #5 from andrei0610/master

Older stuff