Issue #20
Issue #40
Revert "Issue #20"

This reverts commit b8e781f27068de2d00c383d1982a743cbb822f9c.
Merge branch 'master' of https://github.com/asupdev/asup.git