Addressed issue 69 on mattgemmell/master