Merge pull request #15 from amida-tech/afsin

Afsin