Removed dependency on ip-adress.
Merge branch 'release/0.2'