Merge master with 0.0.2 (Enable Travis CI)