Fixed code to warnings when compiling with ASC2
Merge pull request #112 from stevewoolcock/dev

Fixed code to remove warnings when compiling with ASC2