changes
fix issue#17
Merge branch 'master' of github.com:acpmasquerade/framework-26