Merge pull request #59 from paladox2015/master

Update