update
Merge pull request #45 from vomikan/master

update