Refactor
Version 0.1.5