Merge pull request #111 from thatcoderguy/master

Merge pull request #103 from thatcoderguy/Development