sources
Merge pull request #73 from mbartoszek/master

sources 15.05.2014 from marcin