#153 fixes
Merge pull request #154 from amida-tech/afsin

#153 fixes