Code polishing
Merge pull request #18 from stdaniel2994/master

Code polishing