Edited on 04-11-2014

Ready to merge.