Issue 12 is done and ready for mergin