Merge pull request #95 from widagroup/master

Bug fixes
Merge pull request #36 from thatcoderguy/master

Bug fixes