Merge pull request #1 from hashr25/master

Master