Fix for flowersinthesand/portal-java#68
Merge pull request #4 from flowersinthesand/master

Fix for migration to 0.6