Merge pull request #100 from snazy/master

Test case for issue#93
Correcting Checktstyle issues
Fixing issue #93 and #101
Merge remote-tracking branch 'upstream/master'