Initial fix for cont-100
Merge pull request #15 from continuent/cont-100

Initial fix for cont-100