Code refactoring
Version 0.5.1
Version 0.5.2-SNAPSHOT