Fix for Issue #5.
Merge branch 'master' into develop2
Merge pull request #1 from shaunagm/master

Pulling in latest updates for my fork.
Merge branch 'master' into develop2
Merge pull request #19 from noobur/develop2

Fix for Issue #5.