version 1.0
bug fixes