Merge pull request #70 from balrog-kun/master