Merge pull request #4 from riknos314/master

updating to master