[FIX] Formatting
[ADD] Closes #17