updated
Merge branch 'master' of https://github.com/ncai86/POSsim
fix conflicts
fix conflicts