Added some new stuff
Merge pull request #12 from andreicek/master

Added some new stuff