committed oct. 21 2014

Signed-off-by: Hayden Lowes <hlowes@sasktel.net>
committed oct 21

Signed-off-by: Hayden Lowes <hlowes@sasktel.net>