Indendation fix
Added Else before raising exception
Indendation fix
Added Else before raising exception
Missing import of re
Missing import of os
Fixed versioning to master