update to latest versions
Merge pull request #10 from nefilim/master

update to latest versions