FIXES #15
Towards #13