Made buildable on VS2015 and fixed warnings
Merge pull request #2 from KristofferC/VS2015_warnings

Made buildable on VS2015 and fixed warnings