Merge pull request #7 from medullan/ci-build

Updates for ci build
Merge commit 'ffa26f5874b5df4c9dc6b18ef49de10e5eb4bd38' into ci-build