Clean-up
Merge pull request #711 from AlexanderDzhoganov/ci

Prepare branch for continuous- integration setup