Merge pull request #4 from iaen-edu/staging

update branch
Merge pull request #20 from palichis/staging

Merge pull request #4 from iaen-edu/staging