Revert "BUGFIX issue #17: removing Acme default bundle. and fixing some bugs"

This reverts commit fa3a9d5c554c0181ba6960487e9610c323517ed6.