Close issue #1 - After merge adjusts
#2 - Including localeapp gem