Apr 23 work-alma

in class work
Merge pull request #57 from atarectecan/master

Apr 23 work-alma