Changes from coding session 10/06/2014

@owmiee