Merge pull request #4 from ak88/master

pull request