fixing some bugs
cleaning up log format
Merge pull request #207 from PJTNT11/master

sync up
Merge pull request #41 from pstephen43/master

sync up