Fix for call on incorrect variable

Fixes #31
Merge branch 'refs/heads/development' into feature/message-builder