Implementation for #4
Fix StyleCop warnings
Fix for #4
Close #4
Merge pull request #8 from rexcfnghk/#4

Fix #4