added changelog and fixed a bug (20th December 2014)