Issue 9

Ready for review