Merge pull request #36 from thatcoderguy/master

Bug fixes
Merge pull request #96 from widagroup/master

Merge pull request #36 from thatcoderguy/master