Changes in Mar 8th 2015

Too many changes made for about a year!