Merge pull request #30 from nuclearace/master

merge
fix
Merge pull request #31 from nuclearace/logger

Logger