Merge pull request #1 from vrana/master

update