updating master
Merge pull request #5 from andycanderson/andy

updating master