Merge pull request #7 from amida-tech/afsin

Afsin - Issue 310
Merge branch 'master' into afsin-issue-301