Round of 1.5.1 updates
Signed-off-by: Steven Downer <Grinch@outlook.com>
Merge pull request #193 from Grinch/1.5

Round of 1.5.1 updates