Merge pull request #28 from olab-io/gsoc

Continuous Integration