Cleaner implementation
Bumpled version 0.0.4