Resolved: #6

Completed @ 084f13684618bc0ee28b1c0a94fca28205eaaeda