#15
#15
still refactoring will fail on travis