Merge pull request #8 from BTAS/master

sync w BTAS/BTAS