finalizing
Merge pull request #16 from herious1989/master

finalizing