Merge pull request #17 from aparcar/ci