Merge pull request #158 from frodenas/master

Some fixes for OpenStack