Merge pull request #14 from mateoclarke/master

update removes hardcoded values