:dromedary_camel: This closes #5,#6 :umbrella: