issue #14 fix

Issue #14 fixed
Coding standards fixed