Fixes/Closes #15