#47; clean code; upgrade to 2.0
#47;refacotr client and pushmanager;