Merge pull request #36 from thatcoderguy/master

Bug fixes