Add test, bug fix, version up