Merge pull request #111 from thatcoderguy/master

Merge pull request #103 from thatcoderguy/Development
Merge pull request #112 from widagroup/master

Merge pull request #39 from thatcoderguy/master
Merge pull request #113 from thatcoderguy/Development

Merge pull request #111 from thatcoderguy/master
Merge pull request #40 from thatcoderguy/master

Merge changes