0.3.1 bug fixing for RUby 2.0 compatible