Debug (2014 12 18 version)

Messing around with forks and branches