Tested it and fixed some bugs...
Merge branch 'master' of https://github.com/pvandorp/Azure.git