Minor task refactoring
Version up - 0.1.5
Tests fixed