update for master
Merge pull request #5 from tesslins/development

update for master