Fixes issue #13 - typos from issue #8 caused the IDs to be undefined pretty much everywhere
Merge branch 'issue/#3'