Version 0.0.5 (refactoring)