Adding some code
Merge branch 'master' of http://github.com/Springsteen/martin_ivanov_tues