Commit 04/08/2014

Testing the implementation with the code...