Code enhancement
Merge pull request #6 from ekougs/master

Code enhancement