Merge pull request #33 from kamoh/ben_work

Ben work