Bump to 1.2.4
refactoring and bump