(base) commit changes 2014-11-17

changes from xhaggi branch as of 2014-11-17