Issue #68
Issue #69
Merge branch 'master' of https://github.com/asupdev/asup.git