merge with 'wishmaster2016/symath-application'