finished for 1st release
bug fix v1.1 for production