[issue #35] hardcoded ids replaced with proper refs
Merge branch 'bug/35-hardcoded-ids' into dev