Fix #29
Fix #28 and Version Set