Merge pull request #2 from motobyus/master

h