#58 Added some comments