update master branch for further development