Jamie Shaw Fixed issue #30