Merge pull request #411 from leecoder/0.11-devel

Integration with Travis CI