Merge pull request #3 from limbenjamin/master

merge updated code