Added stuff
Added new stuff
Merge pull request #10 from andreicek/master

....