Merge pull request #2 from blockspeiser/master

updating my branch