Fix PLUGIN-60

Signed-off-by: Ian Macalinao <ianmacalinao@gmail.com>
Merge pull request #5 from simplyianm/master

Fix PLUGIN-60