pack of changes
Merge pull request #3 from tomaszrondio/master

pack of changes