Minor reformat, added version checking.