added v4 and PNG - I will start a good branching strategy now - I promise...;