Increase timeout for tests to prevent travis fails
Add comments to 0.1.2