commit from fork
Merge pull request #1 from drunkcoder1/master

commit from fork