merge to the main file
upgrade to 0.1.4