added a few things
Merge branch 'master' of https://github.com/laszlomezzei/balcescu
merging with laci