Merge tag '0.3.4' into develop

Released-0.3.4 0.3.4
added class aliasses to avoid class conflicts, fixed geo behaviour
bumped version
Merge branch 'release/0.3.5'