tmikolajczyk Merge pull request #80 from hbaniecki/master